update Rails for latest CVE

Andrew Cantino 8 年之前
父節點
當前提交
cf9e9bd045
共有 2 個文件被更改,包括 34 次插入34 次删除
  1. 1 1
      Gemfile
  2. 33 33
      Gemfile.lock

+ 1 - 1
Gemfile

@@ -105,7 +105,7 @@ gem 'mini_magick'
105 105
 gem 'multi_xml'
106 106
 gem 'nokogiri', '1.6.7.2'
107 107
 gem 'omniauth'
108
-gem 'rails', '4.2.5.1'
108
+gem 'rails', '4.2.5.2'
109 109
 gem 'rufus-scheduler', '~> 3.0.8', require: false
110 110
 gem 'sass-rails',   '~> 5.0.3'
111 111
 gem 'select2-rails', '~> 3.5.4'

+ 33 - 33
Gemfile.lock

@@ -69,36 +69,36 @@ GEM
69 69
   remote: https://rubygems.org/
70 70
   specs:
71 71
     ace-rails-ap (2.0.1)
72
-    actionmailer (4.2.5.1)
73
-      actionpack (= 4.2.5.1)
74
-      actionview (= 4.2.5.1)
75
-      activejob (= 4.2.5.1)
72
+    actionmailer (4.2.5.2)
73
+      actionpack (= 4.2.5.2)
74
+      actionview (= 4.2.5.2)
75
+      activejob (= 4.2.5.2)
76 76
       mail (~> 2.5, >= 2.5.4)
77 77
       rails-dom-testing (~> 1.0, >= 1.0.5)
78
-    actionpack (4.2.5.1)
79
-      actionview (= 4.2.5.1)
80
-      activesupport (= 4.2.5.1)
78
+    actionpack (4.2.5.2)
79
+      actionview (= 4.2.5.2)
80
+      activesupport (= 4.2.5.2)
81 81
       rack (~> 1.6)
82 82
       rack-test (~> 0.6.2)
83 83
       rails-dom-testing (~> 1.0, >= 1.0.5)
84 84
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
85
-    actionview (4.2.5.1)
86
-      activesupport (= 4.2.5.1)
85
+    actionview (4.2.5.2)
86
+      activesupport (= 4.2.5.2)
87 87
       builder (~> 3.1)
88 88
       erubis (~> 2.7.0)
89 89
       rails-dom-testing (~> 1.0, >= 1.0.5)
90 90
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
91
-    activejob (4.2.5.1)
92
-      activesupport (= 4.2.5.1)
91
+    activejob (4.2.5.2)
92
+      activesupport (= 4.2.5.2)
93 93
       globalid (>= 0.3.0)
94
-    activemodel (4.2.5.1)
95
-      activesupport (= 4.2.5.1)
94
+    activemodel (4.2.5.2)
95
+      activesupport (= 4.2.5.2)
96 96
       builder (~> 3.1)
97
-    activerecord (4.2.5.1)
98
-      activemodel (= 4.2.5.1)
99
-      activesupport (= 4.2.5.1)
97
+    activerecord (4.2.5.2)
98
+      activemodel (= 4.2.5.2)
99
+      activesupport (= 4.2.5.2)
100 100
       arel (~> 6.0)
101
-    activesupport (4.2.5.1)
101
+    activesupport (4.2.5.2)
102 102
       i18n (~> 0.7)
103 103
       json (~> 1.7, >= 1.7.7)
104 104
       minitest (~> 5.1)
@@ -152,7 +152,7 @@ GEM
152 152
       execjs
153 153
     coffee-script-source (1.9.1)
154 154
     colorize (0.7.7)
155
-    concurrent-ruby (1.0.0)
155
+    concurrent-ruby (1.0.1)
156 156
     cookiejar (0.3.2)
157 157
     coveralls (0.7.1)
158 158
       multi_json (~> 1.3)
@@ -314,7 +314,7 @@ GEM
314 314
     memoizable (0.4.2)
315 315
       thread_safe (~> 0.3, >= 0.3.1)
316 316
     method_source (0.8.2)
317
-    mime-types (2.99)
317
+    mime-types (2.99.1)
318 318
     mini_magick (4.2.3)
319 319
     mini_portile2 (2.0.0)
320 320
     minitest (5.8.4)
@@ -390,16 +390,16 @@ GEM
390 390
       rack
391 391
     rack-test (0.6.3)
392 392
       rack (>= 1.0)
393
-    rails (4.2.5.1)
394
-      actionmailer (= 4.2.5.1)
395
-      actionpack (= 4.2.5.1)
396
-      actionview (= 4.2.5.1)
397
-      activejob (= 4.2.5.1)
398
-      activemodel (= 4.2.5.1)
399
-      activerecord (= 4.2.5.1)
400
-      activesupport (= 4.2.5.1)
393
+    rails (4.2.5.2)
394
+      actionmailer (= 4.2.5.2)
395
+      actionpack (= 4.2.5.2)
396
+      actionview (= 4.2.5.2)
397
+      activejob (= 4.2.5.2)
398
+      activemodel (= 4.2.5.2)
399
+      activerecord (= 4.2.5.2)
400
+      activesupport (= 4.2.5.2)
401 401
       bundler (>= 1.3.0, < 2.0)
402
-      railties (= 4.2.5.1)
402
+      railties (= 4.2.5.2)
403 403
       sprockets-rails
404 404
     rails-deprecated_sanitizer (1.0.3)
405 405
       activesupport (>= 4.2.0.alpha)
@@ -414,9 +414,9 @@ GEM
414 414
       rails_stdout_logging
415 415
     rails_serve_static_assets (0.0.4)
416 416
     rails_stdout_logging (0.0.3)
417
-    railties (4.2.5.1)
418
-      actionpack (= 4.2.5.1)
419
-      activesupport (= 4.2.5.1)
417
+    railties (4.2.5.2)
418
+      actionpack (= 4.2.5.2)
419
+      activesupport (= 4.2.5.2)
420 420
       rake (>= 0.8.7)
421 421
       thor (>= 0.18.1, < 2.0)
422 422
     raindrops (0.13.0)
@@ -502,7 +502,7 @@ GEM
502 502
     sprockets (3.5.2)
503 503
       concurrent-ruby (~> 1.0)
504 504
       rack (> 1, < 3)
505
-    sprockets-rails (3.0.0)
505
+    sprockets-rails (3.0.3)
506 506
       actionpack (>= 4.0)
507 507
       activesupport (>= 4.0)
508 508
       sprockets (>= 3.0.0)
@@ -641,7 +641,7 @@ DEPENDENCIES
641 641
   quiet_assets
642 642
   rack (> 1.5.0)
643 643
   rack-livereload (~> 0.3.16)
644
-  rails (= 4.2.5.1)
644
+  rails (= 4.2.5.2)
645 645
   rails_12factor
646 646
   rr
647 647
   rspec (~> 3.2)